From 9826c31a9f22c217f0a1cd4d8334bd22babe1151 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 20 Sep 2010 12:53:46 +0200 Subject: [PATCH] gdk: Get rid of gdk_drawable_get_size() usage --- gdk/gdkdevice.c | 3 ++- gdk/gdkwindow.c | 24 +++++++++--------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index 7a98f6fb0b..4c9421726d 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -1255,7 +1255,8 @@ _gdk_device_translate_window_coord (GdkDevice *device, } window_private = (GdkWindowObject *) window; - gdk_drawable_get_size (window, &window_width, &window_height); + window_width = gdk_window_get_width (window); + window_height = gdk_window_get_height (window); x_resolution = axis_info_x->resolution; y_resolution = axis_info_y->resolution; diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 2a5ade8798..e588a1f8fd 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -3075,15 +3075,10 @@ gdk_window_end_paint (GdkWindow *window) composited->parent; composited = composited->parent) { - int width, height; - - gdk_drawable_get_size (GDK_DRAWABLE (composited->parent), - &width, &height); - clip_box.x += composited->x; clip_box.y += composited->y; - clip_box.width = MIN (clip_box.width, width - clip_box.x); - clip_box.height = MIN (clip_box.height, height - clip_box.y); + clip_box.width = MIN (clip_box.width, composited->parent->width - clip_box.x); + clip_box.height = MIN (clip_box.height, composited->parent->height - clip_box.y); if (composited->composited) { @@ -4318,9 +4313,8 @@ gdk_window_invalidate_rect_full (GdkWindow *window, { window_rect.x = 0; window_rect.y = 0; - gdk_drawable_get_size (GDK_DRAWABLE (window), - &window_rect.width, - &window_rect.height); + window_rect.width = private->width; + window_rect.height = private->height; rect = &window_rect; } @@ -6880,11 +6874,11 @@ gdk_window_set_device_cursor (GdkWindow *window, * * * If @window is not a toplevel, it is much better - * to call gdk_window_get_position() and gdk_drawable_get_size() instead, - * because it avoids the roundtrip to the X server and because - * gdk_drawable_get_size() supports the full 32-bit coordinate space, - * whereas gdk_window_get_geometry() is restricted to the 16-bit - * coordinates of X11. + * to call gdk_window_get_position(), gdk_window_get_width() and + * gdk_window_get_height() instead, because it avoids the roundtrip to + * the X server and because these functions support the full 32-bit + * coordinate space, whereas gdk_window_get_geometry() is restricted to + * the 16-bit coordinates of X11. * **/ void -- 2.30.2